Toying with build script some more