Some fixes for Youtube polymer engine