Fixing some yarn issues