Fix security holes