Fixes for oracle db