small fixes already done on tw production