Replaced more stubs