fixes for ubuntu