- Fixed code for failing test.
- Removed some more warnings.