More porting work. Me likey 1.7.