couple fixes to the no-crc code