Some additional trivial changes to reduce diff with linux