More build script changes for Word of Mouth