Build fixes. Member variables must be iniaized in declared order. Add type to var.