Fixed both the issues that managed to find there way into develop.

At the point of pull, the tests failed and the site would not start - Now these have been fixed and so are being merged into the main project.