Small fixes for configure.js integration.