Minor improvements to Oracle adapter