fix another bunch of warnings I missed

thanks showmp

Change-Id: I5a15c646977b03c6e54a5b4eb22225c32828ce83