A few portability changes, also nobackup now