Relax some dependencies