Fixes

I forgot to add these fixes to the previous merge and thus the code wasn't compiling properly.