Tweaked assignment of NA for too-small buckets