Some work on Polymer 0.1.3 compat