Postal/Zip bug fixes for different generation scenarios