Fix build
Merge pull request #30 from scala/topic/coll-cleanups

Fix build