old fixes from temp-todo.md