James -- cleaning up some android lint issues