Fix variable declarations.