some fixups for unused variables