fixes for release 4.3