Eng 5650 Fix various issues with the log collector