More fixes for Ubuntu