Some last fixups for app click Analytics