Zone diff function, small fixes