Merge "Fix up Looper preparation." into mnc-dev