more checks, adjust for ubuntu