Some changes to catch up on installer changes.