Fix variable assignments