Fix various mistakes for Collections

These include style fixes as well as real errors
See issues for more details

Closes #325
Closes #326
Closes #329
See also #328