Fix up some bugs on Ubu, gonna go some stuff on iMac