More table inheritance fixing