Fixes per Chris's feedback