Finalize more stubs