fix inheritance; remove older API workarounds