Settled minor todo