AVALANCHE: Misc minor polishing