Some fixes.
preparing for the first current-devel release.