minor changes in common.js