small fixes for File handling