#11 - Further z depth fixes