Changes to make logloader start working again