Some bugfixes discovered when building clank-todomvc