Some fix with date plot