Fix compiler -Wreorder warnings