Fixed Small Class Bugs.