Minor cosmetic changes
Upstream changes