release 3 fixes

Fixes for release 3