- fixed minor issues found by analysis tool