Cleanup missed virtual overloads, bugs