Latest version of polymer fixes