Minor fixes with new parse_proto_program