Fix problems on ubuntu