Bugfixes founf in mass testing

More bugs found by Luis I neglected to fix the first time around ;)