Small fixes to satisfy tbl2asn