Misc changes moved from old .init