Resolve more cyclic package dependencies