              ~(when (and (not (:neko.init/release-build *compiler-options*))
                          def)
                 `(def ~(vary-meta def assoc :tag name) ~'this))
-             (.put all-activities ~(or key *ns*) ~'this)
+             (.put all-activities ~*ns* ~'this)
+             ~(when key
+                `(.put all-activities ~key ~'this))
              (neko.init/init (.getApplicationContext ~'this))
              (~on-create ~'this ~'savedInstanceState)))
        ~(when on-create-options-menu

  (and (bound? #'*activity*)
       (activity? *activity*)))

(defn get-decor-view
  "Returns the root view of the given activity."
  [^Activity activity]
  (.. activity getWindow getDecorView))

       (let [dv (get-decor-view activity)]
         (.setTag dv (java.util.HashMap.))
         (.setContentView activity
                          ^View (neko.ui/make-ui-element activity view
                                                         {:id-holder dv}))))))

(defn request-window-features!
  "Requests the given features for the activity.  The features should be
