bug fixes for related schema and Oracle support