polyfacing fixes