Linux porting cleunup next - some strange stuff#2