Fixed total log breakage due to type safety issues