Eliminate some unused variable warnings