More fixes, should have run the tests, duh.