fixes for removal of Num Angle instance