diff --git a/plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/AndroidResourceManagerBase.kt b/plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/AndroidResourceManagerBase.kt
index b530b3ab0de..fa11e4604da 100644
--- a/plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/AndroidResourceManagerBase.kt
+++ b/plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/AndroidResourceManagerBase.kt
@@ -29,11 +29,11 @@ abstract class AndroidResourceManagerBase(project: Project, searchPath: String?)
         val fileManager = VirtualFileManager.getInstance()
         val watchDir = fileManager.findFileByUrl("file://" + searchPath)
         val psiManager = PsiManager.getInstance(project)
-        val files = watchDir?.getChildren()?.toArrayList()?.map { psiManager.findFile(it) }?.mapNotNull { it } ?: ArrayList(0)
+        val files = watchDir?.getChildren()?.toArrayList()?.map { psiManager.findFile(it) }?.mapNotNull { it } ?: listOf()
         return files.sortBy({it.getName()})
     }
 
-    protected fun vritualFileToPsi(vf: VirtualFile): PsiFile? {
+    protected fun virtualFileToPsi(vf: VirtualFile): PsiFile? {
         val psiManager = PsiManager.getInstance(project)
         return psiManager.findFile(vf)
 
diff --git a/plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/IDEAndroidResourceManager.kt b/plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/IDEAndroidResourceManager.kt
index 556e272464e..e2d0fa36f80 100644
--- a/plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/IDEAndroidResourceManager.kt
+++ b/plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/IDEAndroidResourceManager.kt
@@ -35,7 +35,7 @@ public class IDEAndroidResourceManager(project: Project, searchPath: String?) :
     override fun getLayoutXmlFiles(): Collection<PsiFile> {
         try {
             val directories = getAndroidFacet().getAllResourceDirectories()
-            return directories.flatMap { (it.findChild("layout")?.getChildren() ?: array<VirtualFile>()).map { vritualFileToPsi(it)!! } }
+            return directories.flatMap { (it.findChild("layout")?.getChildren() ?: array<VirtualFile>()).map { virtualFileToPsi(it)!! } }
         } catch (e: NoAndroidFacetException) {
             return listOf()
         }