Fix cont pointer use to avoid compiler warning;  correct rebasing
error.

Signed-off-by: Neil McKee <neil.mckee@inmon.com>