More warning fixes.

@caitp please review.