Define missing fields and remove FIXME comments.