Bugfixes with creating locations on the fly