Pie Fix

Change-Id: Ia1c1cfc23b521863db7993cad2581b38ea011f0a
String Fixes