Fixed minor issues in the TODO demo