TDB: first fixes