Bug fix changes.