More references and dependencies fixed