Various changes are supposed to replace stderr