Max channel count + build fix