TrustedSite Support

Fix server errors