SQUASH: fixes to driver