More porting, with stub files