Another batch of warning fixes