Task #0104: Manaual fixes.