AVALANCHE: Repair compilation, minor modifications.