Fixed some mapping issues for tiles