small fixes to generate the values