Tweaks to Yorex flyaway