Add some more stubs