Fixed some variable types