Various Map / Ninja Fixes