Update report and remove schedule + calendar plan
Fix Makefile bug