More porting stuff

Pushy pushy!