Bug fixes for final release.