Analytics: fix some actions