Fixes for cargo and RFC 49