Do some updating for debugging and for smaller systems

Change-Id: I4b5365485c98b132cd418ad623b063a325012bb2