Map a few fixes