Updates from Linux porting