More linux porting hacks - clena-up pending