Additional fixes to handle transparency