Fix easy things in review 391