Updates to compile on Ubuntu.