Porting and 1.7 armour work