Some constants changes