Log parsing fixes