Additional porting steps