Corrected some inheritance/compilation errors.