Implement some more missing fields and fix a field that is not needed.