[Lux] More combo bug fixes