Add some more hacking checks