Minor cosmetic changes/fixes