Fixed opacity issues