Modified build script etc