Made some variable types conform