SOme fixes for collect. references #2132