Fix unused variable warnings