Bit more porting work.