timeout fixes plus Opatch fix