More bug squashing.