Fixed the constants after reorgs