ACT-2141: Fixes for DB2 / Oracle (Thx Tijs for the catch)