Fix c bundle bugs