Fixing more polymer bugs