Some random bug squashing