Modern compiler porting done for now