Goyo related tweaks