Minor fixes, removing lock debugging, formatting