Still fixing/optimizing build tools