Avoid extra updates (as recommended by Jeff)
Fix transparency issue in #210