TEMP fixes

Signed-off-by: Wayne Warren <waynr@sdf.org>
TEMP3 wip

Signed-off-by: Wayne Warren <waynr@sdf.org>