Some fixes for Ubuntu installation