Split out personal manifest, other adjustments