AVALANCHE: Get rid of several magic values