Fix version bounds check and make more consistent