Better handling of size cutoff for short references