Fixes for FileRead.cpp