Fixed unused variables