fixing more errors from renamed fields