Minor fixes for release 3