A couple more cosmetic fix-up