TSAGE: Further bugfixes for ARM base escape