Fixed a bunch of errors which were causing itests not to start up, still have a few more to fix.