Various compilation fixes, some cosmetic changes.
Removed all references to current user/slot from unlock manager.