Stubs fixes