KAA# 114: Minor fixes according to review comments