Clean up on installer
Minor cleanups