Developer experience

discovered 2 small required changes after merging last PR.