Bounds fixes.