Fixed cases in which fields weren't passed in.