First stab at fixing logs