Minor fixups from pullreview