Fix Hakiri issues
Merge pull request #485 from ChrisBr/fix_hakiri_issues

Fix Hakiri issues