Fix DiskSpace issues