fixes to preserve class constructor property ordering