More ReSharper Fixes