fixes for sandbox deployment