Fixes for address and location default values