Minor changes related to the cross-platform build script