Rejig dependencies so that maps work again