Updates to hopefully build deb on Ubuntu 12.04