Fixed problems new framework caused

Running as it should with the new framework.