Fixes for C-terminal database.

Change-Id: I5999ed25043700e807e75dd3b54870645570d15b