Missed things in previous commit