Fixup of issues/todos