Some changes to use Oracle instant client