* Fixes to base class.  [SYS-380]