CDAP-46: moved fixes into LogSaver