Fixes for ubuntu package