Fix users of State for new locked access