Bugs found during bug sweeps

Bugs found during bug sweeps