Fixes

Now it should compile properly.