Additional bugfixes from mass testing

Sid and Tyson found a few more issues - resolved