Few minor changes to make it pass Apple Store validation.