Some fixes for polar painter