Fixed make scripts