Further fixes in frontend code for TMU