Transparency fixes

Fixes bug 590.