Fix some GCC reorder warnings