more fixes for javascript build.