Some fixes for wikimetrics in labs

Change-Id: I72597f458ab00513a500d87e7b5429c072466f50