Fix some variable types.