Changes for fixing add-file, etc.