Fixes for transparency