Add changes to work better on ubuntu