More fixes for ubuntu