Legal fixes