Fix all the issues related to updating Actor and Thing