Fix some more supidly assumed field values that shouldn't be