Rejig some deps