diff --git a/libraries/kotlin-jdbc/kotlin-jdbc.iml b/libraries/kotlin-jdbc/kotlin-jdbc.iml
index e8fb5f6f438..d0d1994b0ae 100644
--- a/libraries/kotlin-jdbc/kotlin-jdbc.iml
+++ b/libraries/kotlin-jdbc/kotlin-jdbc.iml
@@ -3,7 +3,6 @@
   <component name="NewModuleRootManager" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/kotlin" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/kotlin" isTestSource="true" />
@@ -11,10 +10,11 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="stdlib" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:stdlib:1.0-SNAPSHOT" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: com.h2database:h2:1.3.164" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.9" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
-    <orderEntry type="module" module-name="stdlib" />
   </component>
 </module>
 
diff --git a/libraries/website/src/test/kotlin/org/jetbrains/kotlin/site/GenerateSiteTest.kt b/libraries/website/src/test/kotlin/org/jetbrains/kotlin/site/GenerateSiteTest.kt
index 7f0ba32ceb8..3e93ba2c33d 100644
--- a/libraries/website/src/test/kotlin/org/jetbrains/kotlin/site/GenerateSiteTest.kt
+++ b/libraries/website/src/test/kotlin/org/jetbrains/kotlin/site/GenerateSiteTest.kt
@@ -38,8 +38,9 @@ class GenerateSiteTest : TestCase() {
         compiler.exec(System.out, args)
     }
 
-    // TODO re-enable when KT-1522 fixed
-    fun DISABLED_testGenerateJsKDoc(): Unit {
+    // TODO seems to generate exception here - maybe native ctor/function related?
+    // https://github.com/JetBrains/kotlin/blob/master/compiler/backend/src/org/jetbrains/jet/codegen/AnnotationCodegen.java#L80
+    fun TODO_testGenerateJsKDoc(): Unit {
         val outDir = File(siteOutputDir, "versions/$versionDir/jsdocs")
         println("Generating JS KDocs to $outDir")
 
@@ -48,9 +49,11 @@ class GenerateSiteTest : TestCase() {
         args.setModule("../../js/js.libraries/module.kt")
         args.setDocOutputDir(outDir.toString())
         args.setOutputDir("target/classes-js")
+
         val config = args.docConfig
         config.title = "Kotlin JS API ($version)"
         config.version = version
+        config.ignorePackages.add("java")
 
         val compiler = KDocCompiler()
         compiler.exec(System.out, args)
diff --git a/libraries/website/website.iml b/libraries/website/website.iml
index def6237ee42..1b79c656c99 100644
--- a/libraries/website/website.iml
+++ b/libraries/website/website.iml
@@ -10,9 +10,10 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:stdlib:1.0-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-compiler:0.2.3.8" level="project" />
     <orderEntry type="module" module-name="stdlib" />
+    <orderEntry type="module" module-name="kdoc" scope="TEST" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:stdlib:1.0-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Maven: org.pegdown:pegdown:1.1.0" level="project" />
     <orderEntry type="library" name="Maven: org.parboiled:parboiled-core:1.0.2" level="project" />
     <orderEntry type="library" name="Maven: org.parboiled:parboiled-java:1.0.2" level="project" />
@@ -20,7 +21,7 @@
     <orderEntry type="library" name="Maven: asm:asm-util:3.3.1" level="project" />
     <orderEntry type="library" name="Maven: asm:asm-tree:3.3.1" level="project" />
     <orderEntry type="library" name="Maven: asm:asm-analysis:3.3.1" level="project" />
-    <orderEntry type="module" module-name="kdoc" scope="TEST" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.jetbrains.kotlin:kdoc:1.0-SNAPSHOT" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.9" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
   </component>