Mass changes and fixes