small fixes from bug induce refactoring