Fix a few last warnings.