Fix Hakiri issues

Hopefully this will fix some of the issues reported by Hakiri!