A few bug changes.