Some fixes for Ubuntu.