fixes to default values and token resolver