fixes in piston