Some map fixes I've been putting off for a while