Inheritance fixes + logging clean up