Fix other variables