fixups to keep polygon limiting from master