Further fixes to todos