Fix some unused variables