Fixes a few bugs.  Now 30 tests fail (not running longs)