Cleaned up instance variable warnings

Since warnings were turned on in the test suite, I figured you might want them eliminated too.