Attempt to get it all to compile again.