A couple of warning fixes