More bug-squashing