Fixes for File