Fixed errors from class