Alpha handling changes