Minor Lock layout improvements

Mostly adding missing @Override and dealing with very long lines.
Merge pull request #1477 from pveentjer/improvement/3.x/lock-layout-improvements

Minor Lock layout improvements