fix some sandbox issues