pod2 fixes

Change-Id: Idda7ecccfe37dc0b8d0aba4617c204df208912ab
6 files changed