Bug fixes and more stubbing out