Dependency fixup