More bug squashing