Fix variable declarations