Fixes to pscheck