Some integration fixes, path names, etc.