fix regressions from earlier commits
Merge pull request #86 from stdweird/fix_regressions

fix regressions from earlier commits