Migrate from cf-env to cfenv
Get mqlight services properly
Fixes collection only being set by first message