Bounds fixes