Some fixes.
More fixes for it to build