A few more quick warning fixes; don't seem to affect functionality