More sample hacking
Add missing overrides