fixes in ClassHelper