Cosmetic fixes and other updates