Minor Base Class Edits