Minor Lock layout improvements

Mostly adding missing @Override and dealing with very long lines.