Minor tweaks to bound detection