Tweaked some installation files so that they work in the framework, and stand-alone.