Fixes to reflect new version