Modifications to polygon support to make compatible with new cn1 vm