fixes from ubuntu test