Minor input/output improvements