Merge "Fixes around variable usage"