Verify external calls and a bunch of other fixes