BHP1779 Model build odds and ends