Fix logging and charts