Fixes needed for Collage build