More tile loading fixes