Fixes for FileUtils

compiles after previous patch