Stub changes for CU termination