Remove TODO note, as error was not actually present.
Fix minor bugs.