Spirogrip fixes