Fixing some issues with MRO and other obvious bugs.