fixes for release 4