Fix interpackage dependencies