Merge "Improve portability of ErrorLog"