Checksum and updates and fix from upstream