Debug bug fixes

Still in early bringup debug.