fix security exception and update changes