Fix Smart-forward dependencies