Task #0104: Minor manual fixes.