Correct unused identifier warnings