This change attempts to fix some report build issues. It also builds upon development work described in previous changes.