Fixed some class constant lookup