elves/upgrade-scripts-for-0.7

Fixing code written before version 0.7

Go