Some more places where we have ORA errors

@flowerhack @sarina