Fixed compilation errors

Now compiles