tiny fixes for new cargo and cmake