Fix tag builds