StyleCop Errors - Rebase once done