fix a few remaining fields