Fixes -Ofair problems (Closes #2286)