Fixed some resuls and minor build.js issues.