Further fixes in order to introduce multi-sandbox support