Fixes for bounds on TwoFishes