Minor inheritance fixes