set of small commits trying to figure out coverage assert issue #253
set of small commits trying to figure out coverage assert issue #253
couple of small fixes