Cursory work to make Standalone mode work again