Cleanup from previous commit.

Fix some warnings.