fix sandbox issues