Updated Build Scripts - Bugfixes