Shut up some more warnings and undo errors in last warning fix.