Fixes for final release