Fixed ubuntu issues