PistonGlitch Fixes
Ticket #147