some fixes for ubuntu