Minor fixes for Ubuntu