Specs for system-install, some cleanups