Easy fixes based on Bill McCloskey and Keith's feedback