Some quick fixes to the init and map