Fix some warning/cases from my last commit.