Oracle support and some bug fixes