Get everything compiling again