Fixes from Kevin's feedback