More bug squashing
More bug squashing