Fix unused field warnings