1.0 - !lockskip fixes