Bug fixes to previous changes.