Fix tile rendering issues (part 2)