Fixes for release 1.9