Fixed crash on start bug from last push. Also changing NSMapping to the native NSMapTable.