Map and player fixes