A couple of fixes for previous commit.