more porting updates