Merge "Small fixes around variable usage"