Fixed depends based on upstream changes.