More cosmetic improvements