Small fixes for tracking and data form