Fixing some issues with the ads.

Change-Id: I51dc7880b469f54227fc2765b79fd05e8ca918f2