Cosmetic fixes and enhancements