import fixes and analytics fix