Fixed some class constant lookup (2)