Commit small fixes before larger rewrite.