Addtional logs and fixes in adding/removing Mapping Table entries.