Fix missing and renamed fields