Random acts of bug squashing

:bug: