Bug fixes for alternative zip layout and define to toggle it on