Fix: reordered initializers to avoid warnings from GCC