Ribbon fixes