Some init.pp major fixes