Fixes for new release proces