AVALANACHE: Minor bug fix and coding convention fix.