Fix piston checks