Some manual bits from master.