Tweaks to make it work with most recent broker