Adjustments to troubleshoot Analytics