Fixes per suggestions from Chad's rubric