More bug fixes and support for older logs