Fixes analytics