Upgrade changes
Fix upgrade errors
Merge branch 'fix_specs'