More porting, as usual, still broken