Fixed some Circle and Rectangle apps