Small fixes for todo today