Fixes to the scrypt build configuration and patch.