Fixes for locking issues.