Fixed some more stuff so that reading blank files works.