more bug fixes following polymer update