Bugfix and negotiated rates integration