Fix ubuntu issues