Fixing version errors after updgrade