OS minor changes