Add some more stubs; cleanups