Misc warning clean up.