Small tweaks for gcc issues
Merge commit '970ae4edd843122aca677a863e3f1ecaae0f8add'
Merge commit 'af6752a5ebd4b69228cdfdb6bcdb88e5e21d502e'
More crc fixups even though algo is b0rked