Fix conflits with halo and new cm commits