Made a few changes to make sure everything compiles.