More small changes for ubuntu