Fixes for /bin/protocol_driver