Modifications and cleanup for repo install type