Fixes map and hopefully constructable stuff