unlock fixes