Small changes to cope with long ABD tables