A couple of more warning fixes for SP.