Timob 15572 Bug fixes