Fixed some variable declarations