Fix dependencies to refer to tap