Refined scripts to make it easier to build using the latest SDK