Fixed issues with -Wreorder