Tweak yavin settings
merge