More fixes, should now compile correctly.