Fix issues with upgrading to version 10