Fixing up unused variables