Fix issues found in previous commit.