Fixes for unlocking