some reliability fixes