Fixed some Db2 issues