Fixes regarding xlock