Improve some stubs