Fix some stuff missed in last commit.