warning/valgrind fixes
warning/valgrind fixes

crystalline/openc2e,ccdevnet/openc2e,ccdevnet/openc2e,ccdevnet/openc2e,ccdevnet/openc2e,crystalline/openc2e,crystalline/openc2e,ccdevnet/openc2e,crystalline/openc2e,crystalline/openc2e,ccdevnet/openc2e