Fixed a few errors jpf found. A handful of our asserts were written
incorrect. I'm still searching for more instances to fix.