Circle and heading tweaks