Another round of -01 changes