Fixed broken build and tests on Ubuntu.