SYMPHONY-1824 Fixed a few mistakes.