Allow for other channels in entry size calculation. Fix some thinkos.