ReSharper issues resolved