Goon-style fabricators MAP CHANGES

This is needed for the goon fabricator PR to be relevant.