Fix Issues found by ReSharper