small cleanup from recent pull request merges