Fix backwards compatibility behavior of the -U and -s switches