Fixes to inheritation