More OS fixes