diff --git a/build.gradle.kts b/build.gradle.kts
index a724699..394a497 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -50,5 +50,5 @@ allprojects {
 }
 
 val clean by tasks.registering(Delete::class) {
-    delete(buildDir)
-}
\ No newline at end of file
+    delete(layout.buildDirectory)
+}
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 85f43b4..e26be30 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -15,7 +15,7 @@
  */
 
 plugins {
-    `kotlin-dsl`
+    `kotlin-dsl-base`
 }
 
 repositories {
diff --git a/persistentsearchview/src/main/AndroidManifest.xml b/persistentsearchview/src/main/AndroidManifest.xml
deleted file mode 100644
index a3abe90..0000000
--- a/persistentsearchview/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<!--
-  ~ Copyright 2017 Paul Rybitskyi, paul.rybitskyi.work@gmail.com
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
--->
-
-<manifest package="com.paulrybitskyi.persistentsearchview"/>
diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
index 64bbf4b..2d50b27 100644
--- a/sample/src/main/AndroidManifest.xml
+++ b/sample/src/main/AndroidManifest.xml
@@ -14,9 +14,7 @@
   ~ limitations under the License.
 -->
 
-<manifest
-    package="com.paulrybitskyi.persistentsearchview.sample"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"
diff --git a/sample/src/main/java/com/paulrybitskyi/persistentsearchview/sample/DemoActivity.kt b/sample/src/main/java/com/paulrybitskyi/persistentsearchview/sample/DemoActivity.kt
index fbf3b0f..0a52e67 100644
--- a/sample/src/main/java/com/paulrybitskyi/persistentsearchview/sample/DemoActivity.kt
+++ b/sample/src/main/java/com/paulrybitskyi/persistentsearchview/sample/DemoActivity.kt
@@ -220,7 +220,7 @@ internal class DemoActivity : AppCompatActivity(), View.OnClickListener {
                 .start()
         }
 
-        Handler().postDelayed(runnable, 1000L)
+        Handler(Looper.getMainLooper()).postDelayed(runnable, 1000L)
 
         persistentSearchView.hideLeftButton(false)
         persistentSearchView.showProgressBar()