Fixing some resharper issues - no functional changes