Emergency fixes