Fixed some minor issues after converting to class.