Fixing toggle Z-projection bugs