Fixed fields a tad