Fix env zone handling