Solve log issues