Get everything working again