Adding missing  for appropriate vars