diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..d13affe
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+# Ensure all Java files use LF.
+*.java eol=lf
diff --git a/.github/workflows/build-with-bal-test-graalvm.yml b/.github/workflows/build-with-bal-test-graalvm.yml
index 44d147d..2943740 100644
--- a/.github/workflows/build-with-bal-test-graalvm.yml
+++ b/.github/workflows/build-with-bal-test-graalvm.yml
@@ -35,7 +35,4 @@ jobs:
       lang_tag: ${{ inputs.lang_tag }}
       lang_version: ${{ inputs.lang_version }}
       native_image_options: '-J-Xmx7G ${{ inputs.native_image_options }}'
-      additional_ubuntu_build_flags: '-x :graphql-compiler-plugin-tests:test'
-      # TODO : Enable after fixing this issue : https://github.com/ballerina-platform/ballerina-lang/issues/38882
-      # additional_windows_build_flags: '-x :graphql-compiler-plugin-tests:test'
       additional_windows_build_flags: '-x test'
diff --git a/ballerina/build.gradle b/ballerina/build.gradle
index 840f09b..0fdef33 100644
--- a/ballerina/build.gradle
+++ b/ballerina/build.gradle
@@ -115,7 +115,8 @@ task deleteDependencyTomlFiles {
 }
 
 
-updateTomlFiles.dependsOn unpackStdLibs
+updateTomlFiles.dependsOn copyStdlibs
+
 build.dependsOn "generatePomFileForMavenPublication"
 build.dependsOn ":${packageName}-native:build"
 build.dependsOn ":${packageName}-compiler-plugin:build"
diff --git a/build.gradle b/build.gradle
index 7740987..a3939ce 100644
--- a/build.gradle
+++ b/build.gradle
@@ -63,16 +63,11 @@ subprojects {
 
     configurations {
         ballerinaStdLibs
-        jbalTools
     }
 
     dependencies {
-        jbalTools ("org.ballerinalang:jballerina-tools:${ballerinaLangVersion}") {
-            transitive = false
-        }
-
         /* Standard libraries */
-        ballerinaStdLibs "io.ballerina.stdlib:io-ballerina:${stdlibIOVersion}"
+        ballerinaStdLibs "io.ballerina.stdlib:io-ballerina:${stdlibIoVersion}"
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
index 1faa8f5..538c62a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -12,4 +12,4 @@ githubJohnrengelmanShadowVersion=8.1.1
 underCouchDownloadVersion=4.0.4
 researchgateReleaseVersion=2.8.0
 ballerinaGradlePluginVersion=2.0.1
-stdlibIOVersion=1.6.0
+stdlibIoVersion=1.6.0