Fixes for reports and project source for reports