fix environment verification and analytics include