Fix offsets for map