Fix locks. closes #2755