Fix a few bugs and clear some problems with dbug

Change-Id: I116ceecae154a81821eb671751ed74e0862a18f6
Signed-off-by: Scott Mann <smann@noironetworks.com>