Fixed some more porting problems with external raet