Fix some security holes