Basic fixes (some stupid) to get functional tests running green

This PR also contains a commit that reverts the up-voting (feel free to cherry-pick if that doesn't meet your needs).