Move 2 todos to issues