AVALANACHE: Minor cosmetic fixes.