Client element loop fixes