Fixes to user variables.