Fixed Ubuntu issues