Fixing bugs where tiles are drawn in the wrong place.
Manual merge