Fix typos
Fix locking issues, ReSharper 8.1.1 support