diff --git a/googlemaps/src/main/java/nz/co/trademe/mapme/googlemaps/GoogleMapMeAdapter.kt b/googlemaps/src/main/java/nz/co/trademe/mapme/googlemaps/GoogleMapMeAdapter.kt
index c881100..d4d379c 100644
--- a/googlemaps/src/main/java/nz/co/trademe/mapme/googlemaps/GoogleMapMeAdapter.kt
+++ b/googlemaps/src/main/java/nz/co/trademe/mapme/googlemaps/GoogleMapMeAdapter.kt
@@ -3,9 +3,7 @@ package nz.co.trademe.mapme.googlemaps
 import android.content.Context
 import com.google.android.gms.maps.GoogleMap
 import nz.co.trademe.mapme.MapMeAdapter
-import nz.co.trademe.mapme.annotations.MapAnnotation
-import nz.co.trademe.mapme.annotations.OnInfoWindowClickListener
-
-abstract class GoogleMapMeAdapter(context: Context) : MapMeAdapter<GoogleMap>(context, GoogleMapAnnotationFactory()){
-}
 
+abstract class GoogleMapMeAdapter(
+        context: Context
+) : MapMeAdapter<GoogleMap>(context, GoogleMapAnnotationFactory())
\ No newline at end of file
diff --git a/mapme/src/main/java/nz/co/trademe/mapme/MapMeAdapter.kt b/mapme/src/main/java/nz/co/trademe/mapme/MapMeAdapter.kt
index fa1e572..8cf79f2 100644
--- a/mapme/src/main/java/nz/co/trademe/mapme/MapMeAdapter.kt
+++ b/mapme/src/main/java/nz/co/trademe/mapme/MapMeAdapter.kt
@@ -35,7 +35,7 @@ abstract class MapMeAdapter<MapType>(var context: Context, var factory: Annotati
 
     abstract fun getItemCount(): Int
 
-    fun attach(mapView: View, map: MapType) {
+    fun attach(mapView: View?, map: MapType) {
         this.map = map
         this.mapView = mapView
         this.factory.setOnMarkerClickListener(map, { marker -> notifyAnnotatedMarkerClicked(marker) })
@@ -516,7 +516,7 @@ abstract class MapMeAdapter<MapType>(var context: Context, var factory: Annotati
     }
 
     @VisibleForTesting
-    open internal fun triggerUpdateProcessor(runnable: Runnable) {
+    internal open fun triggerUpdateProcessor(runnable: Runnable) {
         mapView?.post(runnable)
     }