Continuing on THUMB execution: fixing minor bugs.
Authored by: debug 2018-10-03
Parent: [r6002]
Child: [r6004]
