Two more bug fixes for the release.