Re-fixed some location format changes to use integer() instead of round()