Bug cleanup.