Fixed minor issues on Ubuntu.