Fixes for timings when using polymer