[RICPLT-1853] Fix some log messages and adjustments