Add more final stubs .. blah this is getting old