Fixes for CQM startup