Fixes to Oracle code