Some fixes in plot2, missing Date convertion