Db little fixes