Fix dependencies on common lib