Fx cop fixes

Please review the changes below and merge to Dev branch.