Should fix warnings.

This should fix the warnings James found.