Changes to make the specs pass.

Still issue with coffee assets.