Fix some -Wreorder bullshit