Resolve checksum issue and increase timeouts