Lock management improvements in Workflow and Registration