Fixed fluffs errors