Jon security fixes