Fix some errors so it compiles
Rename "zone" to "domain"