Warning fixes

Some warning fixes.  There's one small one in arm worth making sure isn't hit, and I'm only 80-90% sure about 3004dcf but the sizes of the arrays make it look right...

-[Unknown]