DDCPP bugfixes

Change-Id: I00aee5ac2f03d7df209ba473be3d30450422057e
Signed-off-by: Meggan Ehret <meggan@qeo.org>