Final improvements for release