Fixes
Range fixes