Fixed issues that stopped this from working standalone.