<tet> Lock in notify, mapdata bug fix