Move size check to decode + 4.16 fixes