More transparency fixes