Analytics integration - bug corrections.