Missed tweaks

Missed these in the last commit.