Fix obvious crashes and load failures in Maps