More fixes for hiera variables.