Fixes for new version.