Fixed bad class method definitions