Fix variables conversions