Small fixes, Added Analytics Bugfix