Make some minor alterations to improve standards compliance