Misc setup tweaks, made wrapper installer omit source of cfg if it isn't needed