Fixed build script & config