Small improvements in io