Fixes so that it compiles and runs as it did before.