Fix variable types.