Fix perimeter in Rectangle, Area in Ellipse, closes #2035, closes #2036