Fixed compile-breaking errors from last commit.