Some fixes and stubs