Additional build script bug fixes.