More cosmetic changes to reduce errors