Added zone defaults
Misc fixes