Fixes for 2 subtle modifies calculation problems.