-Fix variable declarations from last commit.