zip and location fixes