minor class.js and core.js fix