1.4.16 and 1.4.17 (Locations and Bugfixes)