More cosmetic clean ups