Cosmetic changes
Merge branch 'fixes-0.12'