Latest fixes for release