Fix warnings.
Add query objects.