Fixing a couple minor issues + analytics