Added some sensible defaults to stubs