Linux porting cleanup #next