Fixing warnings again (tests passing)