Change more constants