Fixed conditional unlocks