More work to usable for ubuntu and schoebu