Fix bounds and offsets