Fixed unused variables.

Minor changes but these throw warnings during our build process. Thought I'd contribute the changes back.