Trivial fixes for unused variables