Cosmetic changes to force layout parameters