Fixing coding violations from FC