sandbox fixes