relatively minor changes for 2.3.2; get rid of max_dev,