Cosmetic fixes as requested by maintainer