Fixed build script and 1.6.4