ATP Exchange tweaks