minor fixes but incomplete on regtests for crypto (must fix makefiles for openssl)