Some more stubs and cleanups