Minor cleanups after last pull request