Fix compilation issues introduced with previous patches from the OMOP branch.

Signed-off-by: Stefan Marr <git@stefan-marr.de>