More stiction checking yays
Merged