Fixes to make it compile again.

NOTE:  you need the filename for hierarchical composition.