fixes for commonjs