Klaus Silveira - 551: minor fixes