Merged in fixes to circle and text rendering