Same fixes done in gantt loader