Fix security risk issues