Some more inheritance tweaks