Bug fixes on new tileset