Minor IO related tweaks