Build fixed for GCC
Fix incorrect initialization order.
Fix class/struct mismatch.