Some fixes for location getter and setters