fix some mass assignments