TIMODOPEN-349 updates on minor bug fixes