Do not force KeepSource on
Minor cleanups