Add rentry protection and initialisation protection