Fix issues with FileReader