Fix dependency and other clean up.