Some Linux related fixes